Revision: tla--devo--1.1--patch-31
Archive: miles@gnu.org--gnu-2003
Creator: Miles Bader <miles@gnu.org>
Date: Tue Sep 23 19:46:46 EDT 2003
Standard-date: 2003-09-23 23:46:46 GMT
New-files: tests/Makefile.in tests/PLUGIN/.arch-ids/=id
    tests/PLUGIN/.arch-ids/REQ.id tests/PLUGIN/REQ
    tests/jane-and-foo-do-hello-world-1.sh
    tests/test-archive-creation.sh
    tests/test-archive-registration.sh
    tests/test-archive-setup.sh tests/test-file-diffs.sh
    tests/test-framework tests/test-get.sh
    tests/test-import.sh tests/test-mirror-creation.sh
    tests/test-my-id.sh tests/test-parse-package-name.sh
    tests/test-redo.sh tests/test-simple-commits-1.sh
    tests/test-tag.sh tests/test-tagging-defaults.sh
    tests/test-undo.sh tests/test-what-changed.sh
    tests/test-whats-missing.sh
New-directories: tests/PLUGIN tests/PLUGIN/.arch-ids
Modified-files: ChangeLog PLUGIN/options
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/build-revision.c libarch/cmd-cmtrev.c
    libarch/cmd-deltapatch.c libarch/cmd-do-changeset.c
    libarch/cmd-file-diffs.c libarch/cmd-imprev.c
    libarch/cmd-my-revision-library.c
    libarch/cmd-redo-changes.c libarch/cmd-replay.c
    libarch/cmd-star-merge.c libarch/cmd-undo-changes.c
    libarch/cmd-update.c libarch/cmd-what-changed.c
    libarch/commit.c libarch/library-txn.c libarch/replay.c
    libarch/replay.h libarch/star-merge.c
    libarch/star-merge.h libarch/undo.c libarch/undo.h
New-patches: bclg@iup.edu--2003/tla--devo--1.1--patch-8
    lord@emf.net--2003b/tla--devo--1.1--patch-169
    lord@emf.net--2003b/tla--devo--1.1--patch-170
    lord@emf.net--2003b/tla--devo--1.1--patch-171
    lord@emf.net--2003b/tla--devo--1.1--patch-172
    lord@emf.net--2003b/tla--devo--1.1--patch-173
    lord@emf.net--2003b/tla--devo--1.1--patch-174
    lord@emf.net--2003b/tla--devo--1.1--patch-175
    lord@emf.net--2003b/tla--devo--1.1--patch-176
    lord@emf.net--2003b/tla--devo--1.1--patch-177
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-67
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-68
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-69
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-70
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-71
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-72
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-73
    lord@emf.net--2003b/tla--tests--1.1--base-0
    lord@emf.net--2003b/tla--tests--1.1--patch-1
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-31
    walters@verbum.org--2003/tla--mainline--1.1--base-0
    walters@verbum.org--2003/tla--mainline--1.1--patch-1
    walters@verbum.org--2003/tla--mainline--1.1--patch-2
    walters@verbum.org--2003/tla--mainline--1.1--patch-3
    walters@verbum.org--2003/tla--mainline--1.1--patch-4
    walters@verbum.org--2003/tla--mainline--1.1--patch-5
    walters@verbum.org--2003/tla--mainline--1.1--patch-6
    walters@verbum.org--2003/tla--mainline--1.1--patch-7
    walters@verbum.org--2003/tla--mainline--1.1--patch-8
    walters@verbum.org--2003/tla--mainline--1.1--patch-9
    walters@verbum.org--2003/tla--mainline--1.1--patch-10
    walters@verbum.org--2003/tla--mainline--1.1--patch-11
    walters@verbum.org--2003/tla--mainline--1.1--patch-12
    walters@verbum.org--2003/tla--mainline--1.1--patch-13
    walters@verbum.org--2003/tla--mainline--1.1--patch-14
    walters@verbum.org--2003/tla--mainline--1.1--patch-15
    walters@verbum.org--2003/tla--mainline--1.1--patch-16
    walters@verbum.org--2003/tla--mainline--1.1--patch-17
    walters@verbum.org--2003/tla--mainline--1.1--patch-18
    walters@verbum.org--2003/tla--mainline--1.1--patch-19
    walters@verbum.org--2003/tla--mainline--1.1--patch-20
    walters@verbum.org--2003/tla--mainline--1.1--patch-21
    walters@verbum.org--2003/tla--mainline--1.1--patch-22
Summary: Merge from Tom

Patches applied:

 * bclg@iup.edu--2003/tla--devo--1.1--patch-8
   help text fixes

 * lord@emf.net--2003b/tla--devo--1.1--patch-169
   add a test suite! (Colin Walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-170
   [small-fixes] fix off-by-one error in file-diffs (Walters)

 * lord@emf.net--2003b/tla--devo--1.1--patch-171
   3-way merge with conflict markers (in star-merge)

 * lord@emf.net--2003b/tla--devo--1.1--patch-172
   add --forward to various merging commands

 * lord@emf.net--2003b/tla--devo--1.1--patch-173
   [small-fixes] redundant file adds are not an error (apply_changeset)

 * lord@emf.net--2003b/tla--devo--1.1--patch-174
   replay CLI changes (change interface to --exact)

 * lord@emf.net--2003b/tla--devo--1.1--patch-175
   [small-fixes] makefile tweaks for tests subdir

 * lord@emf.net--2003b/tla--devo--1.1--patch-176
   [small-fixes] help text fixes (jmccarty)

 * lord@emf.net--2003b/tla--devo--1.1--patch-177
   [tests] test suite improvements (walters)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-67
   fix off-by-one error in file-diffs (Walters)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-68
   [devo] back merge

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-69
   [devo] back merge

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-70
   redundant file adds are not an error

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-71
   [devo] move back

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-72
   makefile tweaks for tests subdir

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-73
   help text fixes (jmccarty)

 * lord@emf.net--2003b/tla--tests--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-176

 * lord@emf.net--2003b/tla--tests--1.1--patch-1
   test suite improvements (walters)

 * walters@verbum.org--2003/tla--mainline--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-167

 * walters@verbum.org--2003/tla--mainline--1.1--patch-1
   create tla testsuite infrastructure and a simple test

 * walters@verbum.org--2003/tla--mainline--1.1--patch-2
   add my-id test, update test framework

 * walters@verbum.org--2003/tla--mainline--1.1--patch-3
   add archive and mirror creation tests, fix up framework

 * walters@verbum.org--2003/tla--mainline--1.1--patch-4
   add archive setup test, cosmetic fixes to framework

 * walters@verbum.org--2003/tla--mainline--1.1--patch-5
   add import and get tests, remove individual category/branch/version creation

 * walters@verbum.org--2003/tla--mainline--1.1--patch-6
   add first simple commits test, extend get test, cosmetic fixes

 * walters@verbum.org--2003/tla--mainline--1.1--patch-7
   add undo test

 * walters@verbum.org--2003/tla--mainline--1.1--patch-8
   add redo test

 * walters@verbum.org--2003/tla--mainline--1.1--patch-9
   add what-changed test, add verbose option to framework

 * walters@verbum.org--2003/tla--mainline--1.1--patch-10
   add tag test, and run all tests in separate dirs

 * walters@verbum.org--2003/tla--mainline--1.1--patch-11
   use hello-world instead of weird names

 * walters@verbum.org--2003/tla--mainline--1.1--patch-12
   add copying note

 * walters@verbum.org--2003/tla--mainline--1.1--patch-13
   add test-file-diffs

 * walters@verbum.org--2003/tla--mainline--1.1--patch-14
   new copy_tree fn

 * walters@verbum.org--2003/tla--mainline--1.1--patch-15
   handle nonzero exit from file-diffs

 * walters@verbum.org--2003/tla--mainline--1.1--patch-16
   merge with lord

 * walters@verbum.org--2003/tla--mainline--1.1--patch-17
   add star-merge scenario, some cleanups to framework

 * walters@verbum.org--2003/tla--mainline--1.1--patch-18
   extend star-merge test 1

 * walters@verbum.org--2003/tla--mainline--1.1--patch-19
   don't use -s and 1>/dev/null everywhere

 * walters@verbum.org--2003/tla--mainline--1.1--patch-20
   add tagging-defaults and parse-package-name tests

 * walters@verbum.org--2003/tla--mainline--1.1--patch-21
   add whats-missing test

 * walters@verbum.org--2003/tla--mainline--1.1--patch-22
   merge with lord

